From 4e3057fddbc440700812c8daa6440744891fdc91 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 5 Mar 2009 09:32:37 +0000 Subject: [PATCH] [IA64] Remove compilation warning and typo caused by 19268:4b7d638a8b89 Signed-off-by: Isaku Yamahata --- xen/common/xencomm.c | 2 +- xen/include/asm-ia64/mm.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/common/xencomm.c b/xen/common/xencomm.c index 0bf00a7826..247545494d 100644 --- a/xen/common/xencomm.c +++ b/xen/common/xencomm.c @@ -51,7 +51,7 @@ xencomm_get_page(unsigned long paddr, struct page_info **page) return -EFAULT; *page = maddr_to_page(maddr); - if ( !get_page(*page, current->domain) == 0 ) + if ( !get_page(*page, current->domain) ) { /* * This page might be a page granted by another domain, or this page diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h index 9cadc21ba4..ec0af88389 100644 --- a/xen/include/asm-ia64/mm.h +++ b/xen/include/asm-ia64/mm.h @@ -200,7 +200,8 @@ static inline void put_page(struct page_info *page) free_domheap_page(page); } -static inline page_get_owner_and_reference(struct page_info *page) +static inline struct domain *page_get_owner_and_reference( + struct page_info *page) { unsigned long x, y = page->count_info; @@ -226,7 +227,7 @@ static inline int get_page(struct page_info *page, return 1; put_page(page); -fail: + /* if (!domain->is_dying) */ /* XXX: header inclusion hell */ gdprintk(XENLOG_INFO, "Error pfn %lx: rd=%p, od=%p, caf=%016lx, taf=%" PRtype_info "\n", -- 2.30.2